bitkeeper revision 1.1159.187.29 (41aa39b5rEXDtAPSGqjacTncT2yxNQ)
authoriap10@labyrinth.cl.cam.ac.uk <iap10@labyrinth.cl.cam.ac.uk>
Sun, 28 Nov 2004 20:48:53 +0000 (20:48 +0000)
committeriap10@labyrinth.cl.cam.ac.uk <iap10@labyrinth.cl.cam.ac.uk>
Sun, 28 Nov 2004 20:48:53 +0000 (20:48 +0000)
Merge labyrinth.cl.cam.ac.uk:/auto/groups/xeno-xenod/BK/xen-2.0-testing.bk
into labyrinth.cl.cam.ac.uk:/auto/anfs/scratch/labyrinth/iap10/xeno-clone/xeno.bk


Trivial merge